Merge branch 'master' into less-strict-libtest-tests
authorMike Lubinets <lubinetsm@yandex.ru>
Tue, 16 May 2017 13:32:56 +0000 (16:32 +0300)
committerGitHub <noreply@github.com>
Tue, 16 May 2017 13:32:56 +0000 (16:32 +0300)

Trivial merge